fixed defaults
fixed defaults