upgrade to latest shoppe and fixes issues