Fix loader but without optimization