Hi,

I don't know if this is the right approach but the following patch gives
me the expected behaviour.