Should fix #1762.