Still trying to force this into consistent behavior.