Fix for issue #76