#2 quick fix