Fix for Better admin panel