Let's reorganize this...
Patch, fixing some severe panning bug