See attached patch.

Regards,
Petteri