Resolve issues raise by 1539