Fixed leaking interfaces from 05d256c