additional fix for issue #40