Fix world check