Temp workaround around faulty 20160 NTimesteps value