shortlinks fixed