Fix issue with interfaces