fix transition between world and timeline