fix some bug

dirty code, funny times