Right version of previous commit and without debug spam