Another commit for gs-344


### Referenced Issues:
* [Issue 344: something broken](https://projects.glencoesoftware.com/issues/344)