Fixed super call issue