Ticket 419 fix, should fix single world configurations. (Credit to descention)