More consistent approach