improve speed problem from last fix