General - Loading fixed #22