patch has been merged for upcoming 1.8 version