Fixed #1057
Fixed mob loading, part of #1058