amend(loading): simpler/more clean fix for #1914