EB-6807 : Fixed the issue mentioned by John