Added fix for multi-worlds