Bug fix extend only