fixed ElectroService/WAP#16
Merge branch 'WAP#16' fixes ElectroService/WAP#16