Correct missed bits for #455