Fixed #389