Fixed propagation of default arguments