Fixed link creation