Fixes #3967, properly resolve interface