Improvement wrt #333