Fix for things getting double extended