BugFix: Badly passed parameters to factory