Working on #161 no fix yet