new fix for new issu