Fixed some bugs in EntityLoading, it now works correctly