Fixed bug where defaults does not work