World dependency bug fix