Originally intended as the solution to #225 but now just as an improvement for later.
Originally intended as the solution to #225 but now just as an improvement for later.