Previous commit was a bug, not a bugfix!