Yes agreed see #66