KNOX-455 - part two - missed these changes