Issue 61 fixes #61