Resolve #326