Fixed #381