Fix for relative addressing issue