fixed some bug with