Fixing bugs regarding default values
Fixing bug with empty default values