FIXED: Relative addressing bug