EC 2.2.23

Fixed #144