[FIX] Problem with a linkx
Merge branch 'master' into 150