update: fixing some bug...