Fixing #2913

- [x] Added failing test case from #2913
- [ ] Fix done
- [ ] Fix fail