A bit more consistency