Fixed issue related to latest changes