Remove pass-by-reference call, fixes #2, fixes #3