Harish help to fix edge case