Fix credit is not executed issue