Fixed the undefined extend..?