small bug fixed
Set default values correctly