fixed ElectroService/WAP#16