wip fix for issue #43