Issue #318 was more about improving than actually fixing something [ci skip].