fixed analog handling