fixed issues with wrong links