Fix according to BEMINFO-445
Merge pull request #594 from jk708/beminfo-445

Fix according to BEMINFO-445