fixed with bugs