Patch for bug 45

This is a possible patch.
Patch 2 for bug 45
Use world owner instead of bot

Bot is not always the owner of world.