Possible change for #13.