oops) some bug fixing