Added check for current row ID