Make condition clearer