Really fix #72.