Possible fix for newly reported docking issues