Fixing leftover problem introduced by solution for #803