-- fixed checkout issues