Switched to proper linking