Fixed issue 1347 (seemingly infinite loading)