Fix modifier errors

Not sure if this is the right way, but it should work perfectly now.