Actually fix #1754

Thanks to Hiker for the help!