Please see attached patch.

Thanks,
Stefan Kangas