Adds #40 by DMB