FORUM-236 | Fix wrong labels