Fixes an issue with crossloadings