fixed ADL problems