Would anyone mind to spare some time to review this patch? Thanks.