fix but with bugs