Really fix #1