#1762 and then some