WINDUP-336: Tried to fix the compile abortion