Merged c0ffee's patch.