Fixed default value behavior
Merged