Fixing World constructor