Yet some more tweaking of #506