#246 improvements