I am not aware of a fix as this was something we had dealt with as well.
I'll note that if your issue is applying fills you may want to look at upgrading. We're on 7.3 not and there is a function to apply a fill while in 3D mode that is translated when brought into 2D. Works pretty slick.
If you're stuck on 7.1 you'll likely have to keep going with the manual join approach.