Beta v03.2

Old fix didn’t work, apply new fix.