Fix for issue #14