additional fix for issue #21