Shop and Team Bug Fix