Pull bugfix from ngriso