Works for default values only!

* Debug and fix for user supplied values