Fixed #335