extendability fix