Backport #496 fix
...