Fixed extends part of code