additional fix for issue #145