Fixed #357