Changed order of parameters, fixes #8