very hot hotfix for #109