Fixed #348