fixed activemodel