Replace elegant broken solution with ugly working one