...G...... [ZBXNEXT-497] fixed corner cases