Fix bug with default values