Bug fixed? At least avoided.
Merge branch 'Daniel'