Fix for issue #49.