Fixing Peter and Andrey's links