Badname fix #1
Badname fix #2