Fix according to BEMINFO-620
Merge pull request #185 from jk708/620-fix

Fix according to BEMINFO-620