try to solve more elegantly (breaks everything)