fix buug