Fix for #2055 in admin