revert to prev version for now, bugfix causes even more problems