fix very important internals that was, by mistake, not reverted from CM9 framework