Hi Harm

This fixes the both clipping issues.

I guess this will be fixed in next release ?