Classier fix