FIX ISSUE #7. status literals replaced by codes