HUB-164 : Fixed after review