more bug fixed with links