fixed abbug