Fixed bug when default value is empty