fixed some issues like..