Fix for issue #95