Comment 11 for bug 1097532

This patch solves it for me.