Fix for issue #52.