EC 2.2.17

Fixed #129