Bug fix for issue #18