Fixes issue resulting from refactor in previous commit

Offending commit 46539cf621b55bd9ead74b2023208957764b862a