Fixed #382