Really fix #650