fix another issues