Gun Store fix