cleaning code and now we are sure that we fix #8