Fixing image_base adapter for rc 4.0