VE-1101: Potential fix