Fixed extends reference
Merge branch 'fix-extends-ref'