fix default value issues