NPS-7 : fixed the code