fixed bug - setting correct default values