Close #164 equipment numbers fixed