Following patch fixes the XIP computation issue. I removed the normal image