Fixes an issue with the loading order