Bug/3687

One PR to rule them both :-)