Fix for TC-1777. Makes sure to check the interface as well as attribute name