Naive fix attempt