Fixed again the #355 bug