fix for issue #30