Fixies #2737