re #346 (closed)
Closes #346 (closed)
This needs a name fix (I guess we can't have 2 MRs with same name).