Bugfix: args offset has changed since original framework version