Possible fix to AdminTools