Should fix #614.