Fixed hot-loader bug from #2