Mostly for double-ring bug fix