Arguments now passed correctly. Fixes #4