Fixed wrong extending