Fix for nolink functionality