Fix for issue #18