AUI-1332 Fixing dependency bug