Bar code and count fixed