Fixed #378