fixed wierd problems