please add two patches in order to fix two bugs:

e71b38c1d2cc8ab6d896eeeff012ba9a934e583b
bb8b7f5dbf0015232e08906378c49d0af57eb6e1