ugly fix for moving