Added default argument handling where it was missing