hotfix for issue84 rebased