fixed some more issue