Patch 2

patch-1 had another change I don't know where it came. This patch is just multi stage link changed.