[BUG #8661] Make sure to return the old instance