fixed extendComponents