### Describe in detail the problem you had and how this PR fixes it ### Is there an open issue you can link to?