Fix geometry data overflow

This was causing me headaches.