Fix interface again