issue 209
solving every thing