fix for issue #21