Fix bug extends