Fixed incorrect additions and removals that occured in the previous commit