Corrects #2794