fixed 2 bugs with modifiers