Fixed map offset adjusment to happen only in assembly case.