Fixed the problem that made r8018 fail the trusting. Further changes contributes to ticket #927 - changes proposed by GM