Security fix for move across world check