updated ring condition - not only empty fields must be checked, TODO
repair this