Fix mac problem + bug on payment 0 item