Reintroduce hint correctly in adaptor