Added a work around for reassociations that are "translated" back