fixed default value bug
merge fix?