Fixed super methods