Fix issue demonstrated in previous commit