Handled in dde2e2b