amended fix that ensures all old tests pass