Task #151: Fixed bad merge