Issue/1470

No tests needed since it isn't a new functionality