additional fix for issue #180