Fixed issues with badges caused by v0.9.9.14