Fixing MOVED_TO issue