Fix issue on mapper loading order