I have a problem with booting Windows7 right after I changed disks.

• I work with removable harddisks (2 with Windows XP and now 1 with Windows 7 RC1).
• Working with XP is alright.
• Working with Windows 7 is also OK.
• I can startup, shut down as many times as I like.
• BUT,   when I put a drive with XP in and startup it's OK.
• THEN,   put the drive with W-7 in, it won't startup.
• Screen stays black.
• When starting in safe mode, the computer stops with the file "Windows\System32\Drivers\ClassPNP.SYS" and hangs.
• Then I start with the repair disk, and that says "Boot sector code for system disk partition is corrupt"
• Then "Boot sector repair" and the drive is OK again.

I myselve think it is because Windows 7 sees a different harddrive in the BIOS.

Any idea what I can do?