Fixed #393