BUGFIX: default value only when is need