Missing links

Also, we can try to handle theis problem in the future