Feature/fix args

/to @ritch