some fix ..final 2.0.2