Modifier methods fix

Fixed the merge conflict in the other pull request.