fixed location too long issue