Fixing correct coding