Fixed issues with Rebate