Really fix #125