Return correct status code
Unfreeze constants, becasue it is too robust