also works in admin now, fixes #8