Fix multiple click bug with world change