Attempt at fixing  #2052