Changed order of default arguments, fixes