Solution on payment status handler