Second part of the temporary fix to test