Finish fix #4 but also discover #15