Fix for default value and sample configuration