Fixing still enabled link issue