Added the fix for issue #14