some fix..