Before I do a bug fix...