Issue 52

This is the suggested fix described in issue #52.