Bug fix for issue #15