temporary fix for long location wrap...