Fixed issue where defaults override passed arguments