PATCH: Fixed Extend bug