Fix argument list too long error
fixes #1