Fix issue related to []