More clean streamable check