Really fix #69