Merge "Fix minor checker bug"