fix for #645 - ItemNotFoundException