If this is old behavior please do test a bit extra when you change this