In progress : fixing same issue from previous commit