Needed to tackle #612
Needed to tackle #612