Feature/refund bug