Fixed #326