Settings 2.4 & 2.5 fix