Fix for argument positions