need to fix addressable problem