Fix for badges