Suggested fix for issue #52.