Introduce hack to continue working around EOF bug