[IMPORTANT BUG FIX] Wrong field used for comparison