Fix for clipping maps