Fixing issue with default values

This may solve the problem with #22