This looks like a change from previous implementation.