fixed critical bug
Merge pull request #1 from bogdan-dumitrescu/NIBG-1234

fixed critical bug