More BadAss fix