One more change that I forgot in previous commit