- By Benjamin fixed bug 2450
- WIP bug 2622