Fixed return values from modifiers