Thanks @baskaran for the review, fixed and pushed to 8.x-1.x