Infinite (recursion) loop fixed in admin interface