D630 + dock + dual external monitors

I have a d630 with a dock, running 2 external LCD monitors (my laptop is closed). Works perfectly fine, as I want it, UNTIL I undock/redock. If I undock, it goes to the LCD on my laptop (as expected) and everything is fine still. The problem comes when I redock. When I redock the laptop (LCD closed), it SWAPS my left and right external monitor. I can easily fix it by going to nVidia Control panel -> Display -> Change Display Configuration to swap it back. But it's very annoying. So, I'm thinking maybe it doesn't like the fact that I have my right monitor as my "main" monitor, that's why it keeps swapping it. But I have a coworker that has the same exact setup and his left monitor is his main monitor and it swaps it the other way whenever he undock/dock. Am I doing something wrong? Is there a new driver I can install that'll fix this issue? Anyone else experiencing the same issue? The laptop has Quadro MVS 135M video card. nVidia control panel shows version 1.4.2.41