[FIX] Address calculation