[BUGFIX] Fix implementation of arguments