Naive fix