* Notes : small fix in loader