Handle Equipment Fix #6