fixed long issue