Patch attached.

Thanks,
Stefan Kangas