fixed codemate