Helps some parts of #770