Yet more fixing for #506.. :)