A separate commit would have been welcome :)