fixed bug 10 from NarcisRO list