Fixes issue #1 on two more links