#1 fixing code