Bugfix

- [x] Fixes #1504 
- [x] Fixes #1497 
- [ ] Fixes #1500