Fix extension to pass all spec