As suggested by Jan Janak <jan@ryngle.com>
(cherry picked from commit 6bbabbb5d27d6a221d9af04f1c6bf83bd8ae3a23)