Johannes awesome improvement.

This will fix a lot of your non existing problems.