Fixed #7 even more - now the unused weapons don't wepon