Fixed #391