Fix default paramater handling