Fix according to BEMINFO-445