Fixes has_one preservation across versions