loader handling improved