Bug fix with defaults/values