Populate correct defaults
Merge pull request #1006 from AudriusButkevicius/defaults

Populate correct defaults