Actually really fix #16