Fix/linking problem