Core: temporary fix for docking problems.