Fix - Bug on edit labels