Add Workaround for Links