fix those bugs