I made 2 fixes for this great contrib.

More...