Added PoC hotfix function. Very slooooow...