Fixed bug, added default value