AUI-915-fix