FabianKramm Fix internal registry issues

Latest commit 9a5d9c0

Oct 12, 2018