fixed shop issues