Did the hot fix!

World is saved now!
Merge pull request #1 from samirarman/urgent-issue

Did the hot fix!