rebuilt with #349 hotfix