Modified the fix for issue #96