Changing the previous fix to not require operator !=