Last commit may or may not have solved a bug