fix failures introduced by #409