Changed default value
Fixed lockguard bug