Fix according to BEMINFO-40
Merge pull request #220 from 4exova/BEMINFO-40

Fix according to BEMINFO-40