Really fix #9