Bug fix for issue #30