Fix world matching