Working toward 2.1 - noted a bug