@csherrard Are you ok with making this change?