fix for issue #16