fix for issue #12
fix for issue #12