fix for issue #14