Fix issue on loader