Fixes issue with new system