bug fixed return return true