Fixed AbstractValueFactoryAdapter