- Fixed #378