Test for #2055 in admin
Fix for #2055 in admin