make #11 less painful