Implements #409