Make logic more consistent